]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
cleanup: Mark unused (but useful) variables as ignored
authorFlorian Müllner <fmuellner@gnome.org>
Thu, 31 Jan 2019 14:08:00 +0000 (15:08 +0100)
committerFlorian Müllner <fmuellner@gnome.org>
Tue, 23 Jul 2019 22:28:45 +0000 (00:28 +0200)
While we aren't using those destructured variables, they are still useful
to document the meaning of those elements. We don't want eslint to keep
warning about them though, so mark them accordingly.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/627

37 files changed:
js/gdm/loginDialog.js
js/misc/fileUtils.js
js/misc/jsParse.js
js/misc/loginManager.js
js/misc/modemManager.js
js/misc/util.js
js/misc/weather.js
js/perf/hwtest.js
js/ui/accessDialog.js
js/ui/appDisplay.js
js/ui/background.js
js/ui/components/networkAgent.js
js/ui/components/telepathyClient.js
js/ui/dateMenu.js
js/ui/dnd.js
js/ui/endSessionDialog.js
js/ui/extensionSystem.js
js/ui/iconGrid.js
js/ui/keyboard.js
js/ui/layout.js
js/ui/magnifier.js
js/ui/messageList.js
js/ui/notificationDaemon.js
js/ui/padOsd.js
js/ui/remoteSearch.js
js/ui/screenShield.js
js/ui/screenshot.js
js/ui/search.js
js/ui/sessionMode.js
js/ui/shellEntry.js
js/ui/shellMountOperation.js
js/ui/status/system.js
js/ui/switcherPopup.js
js/ui/workspace.js
js/ui/workspaceThumbnail.js
js/ui/workspacesView.js
js/ui/xdndHandler.js

index db8351df9d3206bb781deb01a8c54052aff823a0..3e15e458ed20c762b13827d82d3676ad2ab726eb 100644 (file)
@@ -372,7 +372,7 @@ var SessionMenuButton = class {
         }
 
         for (let i = 0; i < ids.length; i++) {
-            let [sessionName, sessionDescription] = Gdm.get_session_name_and_description(ids[i]);
+            let [sessionName, sessionDescription_] = Gdm.get_session_name_and_description(ids[i]);
 
             let id = ids[i];
             let item = new PopupMenu.PopupMenuItem(sessionName);
index 06ad76eaa319065616ec3da00b9290c9624c508a..0a3c4a3870b31bb544da4f55a32f39db2e06c6cf 100644 (file)
@@ -84,7 +84,7 @@ function loadInterfaceXML(iface) {
     let f = Gio.File.new_for_uri(uri);
 
     try {
-        let [ok, bytes] = f.load_contents(null);
+        let [ok_, bytes] = f.load_contents(null);
         if (bytes instanceof Uint8Array)
             xml = imports.byteArray.toString(bytes);
         else
index 464e6bf8b324c47fae9b23bea5006f38556ce0d8..a254791172fd92c0cf23ffcdcc5f6585172efa21 100644 (file)
@@ -8,7 +8,7 @@
 // This function is likely the one you want to call from external modules
 function getCompletions(text, commandHeader, globalCompletionList) {
     let methods = [];
-    let expr, base;
+    let expr_, base;
     let attrHead = '';
     if (globalCompletionList == null) {
         globalCompletionList = [];
@@ -21,7 +21,7 @@ function getCompletions(text, commandHeader, globalCompletionList) {
         // Look for expressions like "Main.panel.foo" and match Main.panel and foo
         let matches = text.match(/(.*)\.(.*)/);
         if (matches) {
-            [expr, base, attrHead] = matches;
+            [expr_, base, attrHead] = matches;
 
             methods = getPropertyNamesFromExpression(base, commandHeader).filter(
                 attr => attr.slice(0, attrHead.length) == attrHead
@@ -32,7 +32,7 @@ function getCompletions(text, commandHeader, globalCompletionList) {
         // not proceeded by a dot and match them against global constants
         matches = text.match(/^(\w*)$/);
         if (text == '' || matches) {
-            [expr, attrHead] = matches;
+            [expr_, attrHead] = matches;
             methods = globalCompletionList.filter(
                 attr => attr.slice(0, attrHead.length) == attrHead
             );
@@ -230,10 +230,10 @@ function isUnsafeExpression(str) {
 function getDeclaredConstants(str) {
     let ret = [];
     str.split(';').forEach(s => {
-        let base, keyword;
+        let base_, keyword;
         let match = s.match(/const\s+(\w+)\s*=/);
         if (match) {
-            [base, keyword] = match;
+            [base_, keyword] = match;
             ret.push(keyword);
         }
     });
index fa5807794cf9cc23bbdc6532f0c89716c4f68607..74d20eadbc17a354c21371ea839b41ae6c4406d5 100644 (file)
@@ -109,7 +109,7 @@ var LoginManagerSystemd = class {
         let sessionId = GLib.getenv('XDG_SESSION_ID');
         if (!sessionId) {
             log('Unset XDG_SESSION_ID, getCurrentSessionProxy() called outside a user session. Asking logind directly.');
-            let [session, objectPath] = this._userProxy.Display;
+            let [session, objectPath_] = this._userProxy.Display;
             if (session) {
                 log(`Will monitor session ${session}`);
                 sessionId = session;
@@ -182,7 +182,7 @@ var LoginManagerSystemd = class {
             (proxy, result) => {
                 let fd = -1;
                 try {
-                    let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
+                    let [outVariant_, fdList] = proxy.call_with_unix_fd_list_finish(result);
                     fd = fdList.steal_fds()[0];
                     callback(new Gio.UnixInputStream({ fd: fd }));
                 } catch (e) {
index c72253ab6eeac34f60470f9564310695751c43d8..f7240b67c93b689edb0f46abdeb54e1746893aa7 100644 (file)
@@ -120,7 +120,7 @@ var ModemGsm = class {
                 return;
             }
 
-            let [status, code, name] = result;
+            let [status_, code, name] = result;
             this.operator_name = _findProviderForMccMnc(name, code);
             this.emit('notify::operator-name');
         });
@@ -171,7 +171,7 @@ var ModemCdma = class {
                 // it will return an error if the device is not connected
                 this.operator_name = null;
             } else {
-                let [bandClass, band, sid] = result;
+                let [bandClass_, band_, sid] = result;
 
                 this.operator_name = _findProviderForSid(sid);
             }
@@ -224,7 +224,7 @@ var BroadbandModem = class {
     }
 
     _reloadSignalQuality() {
-        let [quality, recent] = this._proxy.SignalQuality;
+        let [quality, recent_] = this._proxy.SignalQuality;
         this.signal_quality = quality;
         this.emit('notify::signal-quality');
     }
index b97218e0733fda160184c8ab74ee4bab1d5698f9..d4441d960d344f6490b6fc86fbd1405981665d49 100644 (file)
@@ -75,7 +75,7 @@ function spawn(argv) {
 // occur when trying to parse or start the program.
 function spawnCommandLine(commandLine) {
     try {
-        let [success, argv] = GLib.shell_parse_argv(commandLine);
+        let [success_, argv] = GLib.shell_parse_argv(commandLine);
         trySpawn(argv);
     } catch (err) {
         _handleSpawnError(commandLine, err);
@@ -104,11 +104,11 @@ function spawnApp(argv) {
 // Runs @argv in the background. If launching @argv fails,
 // this will throw an error.
 function trySpawn(argv) {
-    var success, pid;
+    var success_, pid;
     try {
-        [success, pid] = GLib.spawn_async(null, argv, null,
-                                          GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
-                                          null);
+        [success_, pid] = GLib.spawn_async(null, argv, null,
+                                           GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
+                                           null);
     } catch (err) {
         /* Rewrite the error in case of ENOENT */
         if (err.matches(GLib.SpawnError, GLib.SpawnError.NOENT)) {
@@ -139,10 +139,10 @@ function trySpawn(argv) {
 // Runs @commandLine in the background. If launching @commandLine
 // fails, this will throw an error.
 function trySpawnCommandLine(commandLine) {
-    let success, argv;
+    let success_, argv;
 
     try {
-        [success, argv] = GLib.shell_parse_argv(commandLine);
+        [success_, argv] = GLib.shell_parse_argv(commandLine);
     } catch (err) {
         // Replace "Error invoking GLib.shell_parse_argv: " with
         // something nicer
@@ -395,7 +395,7 @@ function makeCloseButton(boxpointer) {
 
 function ensureActorVisibleInScrollView(scrollView, actor) {
     let adjustment = scrollView.vscroll.adjustment;
-    let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
+    let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();
 
     let offset = 0;
     let vfade = scrollView.get_effect("fade");
index 486a86050e4b0151fd461b6f818a66fcbe636e69..efd8ce82daa1b0c32b3a90499f4f7aeacdc056b4 100644 (file)
@@ -234,7 +234,7 @@ var WeatherClient = class {
     }
 
     _onPermStoreChanged(proxy, sender, params) {
-        let [table, id, deleted, data, perms] = params;
+        let [table, id, deleted_, data_, perms] = params;
 
         if (table != 'gnome' || id != 'geolocation')
             return;
index 43b663c2dad4d389c6c1886d405de3623e30289b..15ba6b8977e2dc91e16ebdd7ebdf360d310caa42 100644 (file)
@@ -74,7 +74,7 @@ function extractBootTimestamp() {
 
     let datastream = Gio.DataInputStream.new(sp.get_stdout_pipe());
     while (true) {
-        let [line, length] = datastream.read_line_utf8(null);
+        let [line, length_] = datastream.read_line_utf8(null);
         if (line === null)
             break;
 
index 9dbc1a910d1421c28fb6264b94c247eaea7ad3d9..462abe31e34cdc950fe4686301c9d46166c5b2ea 100644 (file)
@@ -132,7 +132,7 @@ var AccessDialogDBus = class {
             return;
         }
 
-        let [handle, appId, parentWindow, title, subtitle, body, options] = params;
+        let [handle, appId, parentWindow_, title, subtitle, body, options] = params;
         // We probably want to use parentWindow and global.display.focus_window
         // for this check in the future
         if (appId && `${appId}.desktop` != this._windowTracker.focus_app.id) {
index 9129c7776ed92af0a8c88c0dcbe056a25e3f3d2e..5bb8e61ff11afd428ab1756d02b344ae06af19ab 100644 (file)
@@ -546,7 +546,7 @@ var AllView = class AllView extends BaseAppView {
             return false;
         this._panning = true;
         this._clickAction.release();
-        let [dist, dx, dy] = action.get_motion_delta(0);
+        let [dist_, dx_, dy] = action.get_motion_delta(0);
         let adjustment = this._adjustment;
         adjustment.value -= (dy / this._scrollView.height) * adjustment.page_size;
         return false;
@@ -1066,7 +1066,7 @@ var FolderView = class FolderView extends BaseAppView {
     }
 
     _onPan(action) {
-        let [dist, dx, dy] = action.get_motion_delta(0);
+        let [dist_, dx_, dy] = action.get_motion_delta(0);
         let adjustment = this.actor.vscroll.adjustment;
         adjustment.value -= (dy / this.actor.height) * adjustment.page_size;
         return false;
index 38f52c670da2386260c1622a1ea962c340aa5fea..2429c7cab137610ee25a4b816d6800cc4d0d3d2f 100644 (file)
@@ -333,12 +333,12 @@ var Background = class Background {
     }
 
     _loadPattern() {
-        let colorString, res, color, secondColor;
+        let colorString, res_, color, secondColor;
 
         colorString = this._settings.get_string(PRIMARY_COLOR_KEY);
-        [res, color] = Clutter.Color.from_string(colorString);
+        [res_, color] = Clutter.Color.from_string(colorString);
         colorString = this._settings.get_string(SECONDARY_COLOR_KEY);
-        [res, secondColor] = Clutter.Color.from_string(colorString);
+        [res_, secondColor] = Clutter.Color.from_string(colorString);
 
         let shadingType = this._settings.get_enum(COLOR_SHADING_TYPE_KEY);
 
@@ -651,7 +651,7 @@ var Animation = class Animation {
         if (this._show.get_num_slides() < 1)
             return;
 
-        let [progress, duration, isFixed, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
+        let [progress, duration, isFixed_, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
 
         this.transitionDuration = duration;
         this.transitionProgress = progress;
index 597bb18837ede58daa7349f0eb528fa50eeea6e6..338371d13ee01ab20ac23bcb94742f41aaf3d435 100644 (file)
@@ -385,7 +385,7 @@ var VPNRequestHandler = class {
         this._newStylePlugin = authHelper.externalUIMode;
 
         try {
-            let [success, pid, stdin, stdout, stderr] =
+            let [success_, pid, stdin, stdout, stderr] =
                 GLib.spawn_async_with_pipes(null, /* pwd */
                                             argv,
                                             null, /* envp */
@@ -486,7 +486,7 @@ var VPNRequestHandler = class {
 
     _readStdoutOldStyle() {
         this._dataStdout.read_line_async(GLib.PRIORITY_DEFAULT, null, (stream, result) => {
-            let [line, len] = this._dataStdout.read_line_finish_utf8(result);
+            let [line, len_] = this._dataStdout.read_line_finish_utf8(result);
 
             if (line == null) {
                 // end of file
@@ -541,7 +541,7 @@ var VPNRequestHandler = class {
                                 message: keyfile.get_string(VPN_UI_GROUP, 'Description'),
                                 secrets: [] };
 
-            let [groups, len] = keyfile.get_groups();
+            let [groups, len_] = keyfile.get_groups();
             for (let i = 0; i < groups.length; i++) {
                 if (groups[i] == VPN_UI_GROUP)
                     continue;
index 0fefd960ef5198437350796b33d9adce2cfd3eca..e8b2dbabbf59fea8490e1dc1db345cc8db32b661 100644 (file)
@@ -41,7 +41,7 @@ var NotificationDirection = {
 };
 
 function makeMessageFromTpMessage(tpMessage, direction) {
-    let [text, flags] = tpMessage.to_text();
+    let [text, flags_] = tpMessage.to_text();
 
     let timestamp = tpMessage.get_sent_timestamp();
     if (timestamp == 0)
@@ -148,11 +148,11 @@ class TelepathyClient extends Tp.BaseClient {
     }
 
     vfunc_observe_channels(...args) {
-        let [account, conn, channels, dispatchOp, requests, context] = args;
+        let [account, conn, channels, dispatchOp_, requests_, context] = args;
         let len = channels.length;
         for (let i = 0; i < len; i++) {
             let channel = channels[i];
-            let [targetHandle, targetHandleType] = channel.get_handle();
+            let [targetHandle_, targetHandleType] = channel.get_handle();
 
             if (channel.get_invalidated())
                 continue;
@@ -181,7 +181,7 @@ class TelepathyClient extends Tp.BaseClient {
     }
 
     vfunc_handle_channels(...args) {
-        let [account, conn, channels, requests, userActionTime, context] = args;
+        let [account, conn, channels, requests_, userActionTime_, context] = args;
         this._handlingChannels(account, conn, channels, true);
         context.accept();
     }
@@ -239,7 +239,7 @@ class TelepathyClient extends Tp.BaseClient {
     }
 
     _approveTextChannel(account, conn, channel, dispatchOp, context) {
-        let [targetHandle, targetHandleType] = channel.get_handle();
+        let [targetHandle_, targetHandleType] = channel.get_handle();
 
         if (targetHandleType != Tp.HandleType.CONTACT) {
             context.fail(new Tp.Error({ code: Tp.Error.INVALID_ARGUMENT,
@@ -427,7 +427,7 @@ var ChatSource = class extends MessageTray.Source {
     }
 
     _displayPendingMessages(logManager, result) {
-        let [success, events] = logManager.get_filtered_events_finish(result);
+        let [success_, events] = logManager.get_filtered_events_finish(result);
 
         let logMessages = events.map(makeMessageFromTplEvent);
         this._ensureNotification();
index 87979bd616525be3f81d7421d1beaba3bf083045..4b6dd922a255c803a5eb42765f542c02a7041a85 100644 (file)
@@ -249,12 +249,12 @@ var WeatherSection = class WeatherSection {
         let current = info;
         let infos = [info];
         for (let i = 0; i < forecasts.length; i++) {
-            let [ok, timestamp] = forecasts[i].get_value_update();
+            let [ok_, timestamp] = forecasts[i].get_value_update();
             let datetime = new Date(timestamp * 1000);
             if (!_isToday(datetime))
                 continue; // Ignore forecasts from other days
 
-            [ok, timestamp] = current.get_value_update();
+            [ok_, timestamp] = current.get_value_update();
             let currenttime = new Date(timestamp * 1000);
             if (currenttime.getHours() == datetime.getHours())
                 continue; // Enforce a minimum interval of 1h
@@ -275,7 +275,7 @@ var WeatherSection = class WeatherSection {
 
         let col = 0;
         infos.forEach(fc => {
-            let [ok, timestamp] = fc.get_value_update();
+            let [ok_, timestamp] = fc.get_value_update();
             let timeStr = Util.formatTime(new Date(timestamp * 1000), {
                 timeOnly: true
             });
index 99273b781cdab34215e23fa94744502a0c8424c5..5172b845f302ba0235e8e35c778d62f3ecc4e090 100644 (file)
@@ -503,7 +503,7 @@ var _Draggable = class _Draggable {
 
         while (target) {
             if (target._delegate && target._delegate.handleDragOver) {
-                let [r, targX, targY] = target.transform_stage_point(this._dragX, this._dragY);
+                let [r_, targX, targY] = target.transform_stage_point(this._dragX, this._dragY);
                 // We currently loop through all parents on drag-over even if one of the children has handled it.
                 // We can check the return value of the function and break the loop if it's true if we don't want
                 // to continue checking the parents.
@@ -575,7 +575,7 @@ var _Draggable = class _Draggable {
 
         while (target) {
             if (target._delegate && target._delegate.acceptDrop) {
-                let [r, targX, targY] = target.transform_stage_point(dropX, dropY);
+                let [r_, targX, targY] = target.transform_stage_point(dropX, dropY);
                 if (target._delegate.acceptDrop(this.actor._delegate,
                                                 this._dragActor,
                                                 targX,
index 5288badc8c618c28975663f22e24b2d03b7ada08..491fee8d0005cfbb9bd79490985574ded1f33f0b 100644 (file)
@@ -668,7 +668,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         this._loginManager.listSessions(result => {
             let n = 0;
             for (let i = 0; i < result.length; i++) {
-                let [id, uid, userName, seat, sessionPath] = result[i];
+                let [id_, uid_, userName, seat_, sessionPath] = result[i];
                 let proxy = new LogindSession(Gio.DBus.system, 'org.freedesktop.login1', sessionPath);
 
                 if (proxy.Class != 'user')
index 2099d709d3cd8d4ba46a948f9ac4d161cbf7229f..7cf5e4453c21649d271c925510fb342619f37b79 100644 (file)
@@ -203,9 +203,9 @@ var ExtensionManager = class {
             throw new Error('Missing metadata.json');
         }
 
-        let metadataContents, success;
+        let metadataContents, success_;
         try {
-            [success, metadataContents] = metadataFile.load_contents(null);
+            [success_, metadataContents] = metadataFile.load_contents(null);
             if (metadataContents instanceof Uint8Array)
                 metadataContents = imports.byteArray.toString(metadataContents);
         } catch (e) {
index c80f7fe1a27b3b30c74a04d1969fe2be64eb02d2..5eec995c53834ecb80c656a889364dcfc0d2a258 100644 (file)
@@ -865,7 +865,7 @@ var PaginatedIconGrid = GObject.registerClass({
     }
 
     _computePages(availWidthPerPage, availHeightPerPage) {
-        let [nColumns, usedWidth] = this._computeLayout(availWidthPerPage);
+        let [nColumns, usedWidth_] = this._computeLayout(availWidthPerPage);
         let nRows;
         let children = this._getVisibleChildren();
         if (nColumns > 0)
index 0372fb8ea50cc52a3572eeff2d11a8687b389f76..d4d41a638e521bf6c8f42f48d2d496c311ceb42c 100644 (file)
@@ -474,7 +474,7 @@ var KeyboardModel = class {
 
     _loadModel(groupName) {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/osk-layouts/%s.json'.format(groupName));
-        let [success, contents] = file.load_contents(null);
+        let [success_, contents] = file.load_contents(null);
         if (contents instanceof Uint8Array)
             contents = imports.byteArray.toString(contents);
 
@@ -662,7 +662,7 @@ var EmojiPager = class EmojiPager {
     }
 
     _onPan(action) {
-        let [dist, dx, dy] = action.get_motion_delta(0);
+        let [dist_, dx, dy_] = action.get_motion_delta(0);
         this.delta = this.delta + dx;
 
         if (this._currentKey != null) {
@@ -904,7 +904,7 @@ var EmojiSelection = class EmojiSelection {
 
     _populateSections() {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/osk-layouts/emoji.json');
-        let [success, contents] = file.load_contents(null);
+        let [success_, contents] = file.load_contents(null);
 
         if (contents instanceof Uint8Array)
             contents = imports.byteArray.toString(contents);
index 6e2664738f498fb6f2003b6ad66894f38279f631..2e6db7b6f5027cdcfa03b1aa844eb14d23ff789d 100644 (file)
@@ -1331,7 +1331,7 @@ var PressureBarrier = class PressureBarrier {
         let threshold = this._lastTime - this._timeout;
 
         while (i < this._barrierEvents.length) {
-            let [time, distance] = this._barrierEvents[i];
+            let [time, distance_] = this._barrierEvents[i];
             if (time >= threshold)
                 break;
             i++;
@@ -1340,7 +1340,7 @@ var PressureBarrier = class PressureBarrier {
         let firstNewEvent = i;
 
         for (i = 0; i < firstNewEvent; i++) {
-            let [time, distance] = this._barrierEvents[i];
+            let [time_, distance] = this._barrierEvents[i];
             this._currentPressure -= distance;
         }
 
index 8713794c787e1c5c4e0a66a7a474edf4eb142170..379ff5b4dc04c9738085b4edb1e1c82408514b88 100644 (file)
@@ -359,7 +359,7 @@ var Magnifier = class Magnifier {
      */
     setCrosshairsColor(color) {
         if (this._crossHairs) {
-            let [res, clutterColor] = Clutter.Color.from_string(color);
+            let [res_, clutterColor] = Clutter.Color.from_string(color);
             this._crossHairs.setColor(clutterColor);
         }
     }
@@ -1514,7 +1514,7 @@ var ZoomRegion = class ZoomRegion {
     }
 
     _centerFromPointProportional(xPoint, yPoint) {
-        let [xRoi, yRoi, widthRoi, heightRoi] = this.getROI();
+        let [xRoi_, yRoi_, widthRoi, heightRoi] = this.getROI();
         let halfScreenWidth = global.screen_width / 2;
         let halfScreenHeight = global.screen_height / 2;
         // We want to pad with a constant distance after zooming, so divide
index c8f4b934630371b6e80aec76046cf498c6472a1d..2cc1164169d92f2a916852e06ff69b4412d8a9cb 100644 (file)
@@ -130,12 +130,12 @@ var URLHighlighter = class URLHighlighter {
     }
 
     _findUrlAtPos(event) {
-        let success;
+        let success_;
         let [x, y] = event.get_coords();
-        [success, x, y] = this.actor.transform_stage_point(x, y);
+        [success_, x, y] = this.actor.transform_stage_point(x, y);
         let findPos = -1;
         for (let i = 0; i < this.actor.clutter_text.text.length; i++) {
-            let [success, px, py, lineHeight] = this.actor.clutter_text.position_to_coords(i);
+            let [success_, px, py, lineHeight] = this.actor.clutter_text.position_to_coords(i);
             if (py > y || py + lineHeight < y || x < px)
                 continue;
             findPos = i;
index 17844ca5ece3f0611082ed24d02ef3b183e6b7fd..c541bd0a4c763dd35890626e598119ffda5d47c5 100644 (file)
@@ -64,7 +64,7 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
     _imageForNotificationData(hints) {
         if (hints['image-data']) {
             let [width, height, rowStride, hasAlpha,
-                 bitsPerSample, nChannels, data] = hints['image-data'];
+                 bitsPerSample, nChannels_, data] = hints['image-data'];
             return Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
                                                       bitsPerSample, width, height, rowStride);
         } else if (hints['image-path']) {
@@ -259,7 +259,7 @@ var FdoNotificationDaemon = class FdoNotificationDaemon {
     }
 
     _notifyForSource(source, ndata) {
-        let [id, icon, summary, body, actions, hints, notification] =
+        let [id_, icon, summary, body, actions, hints, notification] =
             [ndata.id, ndata.icon, ndata.summary, ndata.body,
              ndata.actions, ndata.hints, ndata.notification];
 
index 0da827718b80d45712027f68b5a94e0cc5a70a60..2e76240bb9ee6b29bb4e13365b78b8ee44fed0ec 100644 (file)
@@ -295,7 +295,7 @@ var PadDiagram = GObject.registerClass({
 }, class PadDiagram extends St.DrawingArea {
     _init(params) {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/pad-osd.css');
-        let [success, css, etag] = file.load_contents(null);
+        let [success_, css] = file.load_contents(null);
         if (css instanceof Uint8Array)
             css = imports.byteArray.toString(css);
         this._curEdited = null;
@@ -419,13 +419,13 @@ var PadDiagram = GObject.registerClass({
 
         for (let i = 0; i < this._labels.length; i++) {
             let [label, action, idx, dir] = this._labels[i];
-            let [found, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
+            let [found_, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
             this._allocateChild(label, x, y, arrangement);
         }
 
         if (this._editorActor && this._curEdited) {
-            let [label, action, idx, dir] = this._curEdited;
-            let [found, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
+            let [label_, action, idx, dir] = this._curEdited;
+            let [found_, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
             this._allocateChild(this._editorActor, x, y, arrangement);
         }
     }
@@ -561,7 +561,7 @@ var PadDiagram = GObject.registerClass({
         if (str != null) {
             label.set_text(str);
 
-            let [found, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
+            let [found_, x, y, arrangement] = this.getLabelCoords(action, idx, dir);
             this._allocateChild(label, x, y, arrangement);
         }
         label.show();
@@ -789,13 +789,13 @@ var PadOsd = class {
         } else if (event.get_source_device() == this.padDevice &&
                    event.type() == Clutter.EventType.PAD_STRIP) {
             if (this._editionMode) {
-                let [retval, number, mode] = event.get_pad_event_details();
+                let [retval_, number, mode] = event.get_pad_event_details();
                 this._startStripActionEdition(number, UP, mode);
             }
         } else if (event.get_source_device() == this.padDevice &&
                    event.type() == Clutter.EventType.PAD_RING) {
             if (this._editionMode) {
-                let [retval, number, mode] = event.get_pad_event_details();
+                let [retval_, number, mode] = event.get_pad_event_details();
                 this._startRingActionEdition(number, CCW, mode);
             }
         }
index b9d20325c7ad22286d4e806ab4242f0b37316d4a..8084179611f5ca7de185a9bf8262f318bf50f566 100644 (file)
@@ -221,7 +221,7 @@ var RemoteSearchProvider = class {
             gicon = Gio.icon_new_for_string(meta['gicon']);
         } else if (meta['icon-data']) {
             let [width, height, rowStride, hasAlpha,
-                 bitsPerSample, nChannels, data] = meta['icon-data'];
+                 bitsPerSample, nChannels_, data] = meta['icon-data'];
             gicon = Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
                                                        bitsPerSample, width, height, rowStride);
         }
index 4bcaa7feed4aba8a1c0fc8a8a4e42a292ef01fc0..203c3ada8395f6f1fd0f68450577d78dd4e4c355 100644 (file)
@@ -778,7 +778,7 @@ var ScreenShield = class {
             return;
         if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) {
             // Complete motion automatically
-            let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0);
+            let [velocity_, velocityX_, velocityY] = this._dragAction.get_velocity(0);
             this._liftShield(true, -velocityY);
         } else {
             // restore the lock screen to its original place
index c9f6bc1f4eb8b8e4d6264cde70de4dbb7b83dff1..3207395477992439857bf0f61afc4dcac71ad97b 100644 (file)
@@ -199,7 +199,7 @@ var ScreenshotService = class {
                 if (!screenshot)
                     return;
                 screenshot.pick_color(...coords, (o, res) => {
-                    let [success, color] = screenshot.pick_color_finish(res);
+                    let [success_, color] = screenshot.pick_color_finish(res);
                     let { red, green, blue } = color;
                     let retval = GLib.Variant.new('(a{sv})', [{
                         color: GLib.Variant.new('(ddd)', [
index ab6ba9dfa125decaa98badf54606969078284239..b1235eb65dd720a1fbea8e84fc141935bf307a34 100644 (file)
@@ -560,7 +560,7 @@ var SearchResults = class {
     }
 
     _onPan(action) {
-        let [dist, dx, dy] = action.get_motion_delta(0);
+        let [dist_, dx_, dy] = action.get_motion_delta(0);
         let adjustment = this._scrollView.vscroll.adjustment;
         adjustment.value -= (dy / this.actor.height) * adjustment.page_size;
         return false;
index 0a35afed0723dc7c53926d810f778cb5063021ef..91ce58c4adee629676b04320b9d2ba6bac0726c2 100644 (file)
@@ -114,9 +114,9 @@ function _loadMode(file, info) {
     if (_modes.hasOwnProperty(modeName))
         return;
 
-    let fileContent, success, newMode;
+    let fileContent, success_, newMode;
     try {
-        [success, fileContent] = file.load_contents(null);
+        [success_, fileContent] = file.load_contents(null);
         if (fileContent instanceof Uint8Array)
             fileContent = imports.byteArray.toString(fileContent);
         newMode = JSON.parse(fileContent);
index 102aee5ac5c560c417d21acf5d3e13e20fa9ee80..3b18d3459c7be39821b4b621f82c8327fae4ace6 100644 (file)
@@ -134,7 +134,7 @@ function _onButtonPressEvent(actor, event, entry) {
 }
 
 function _onPopup(actor, entry) {
-    let [success, textX, textY, lineHeight] = entry.clutter_text.position_to_coords(-1);
+    let [success, textX, textY_, lineHeight_] = entry.clutter_text.position_to_coords(-1);
     if (success)
         entry.menu.setSourceAlignment(textX / entry.width);
     entry.menu.open(BoxPointer.PopupAnimation.FULL);
index ef2ad3ec5336da26b83ce359965db9baa52d4f90..14cf0db6e93834a9361560078d22408b741e7ba6 100644 (file)
@@ -628,7 +628,7 @@ var GnomeShellMountOpHandler = class {
      * attempt went wrong.
      */
     AskPasswordAsync(params, invocation) {
-        let [id, message, iconName, defaultUser, defaultDomain, flags] = params;
+        let [id, message, iconName, defaultUser_, defaultDomain_, flags] = params;
 
         if (this._setCurrentRequest(invocation, id, ShellMountOperationType.ASK_PASSWORD)) {
             this._dialog.reaskPassword();
index adb32116f8bb9840a7a3acc69b08120f494214f6..6c2e2c8e26c5fc019278bb1bbce3d82315c5397a 100644 (file)
@@ -39,7 +39,7 @@ var AltSwitcher = class {
         let childToShow = null;
 
         if (this._standard.visible && this._alternate.visible) {
-            let [x, y, mods] = global.get_pointer();
+            let [x_, y_, mods] = global.get_pointer();
             let altPressed = (mods & Clutter.ModifierType.MOD1_MASK) != 0;
             if (this._flipped)
                 childToShow = altPressed ? this._standard : this._alternate;
index 9e7310a84b3c145280dac54e90f0df01876c1cc7..6e069080957ccafcfa49480197c8d8d4d59890a0 100644 (file)
@@ -131,7 +131,7 @@ var SwitcherPopup = GObject.registerClass({
         // details.) So we check now. (Have to do this after updating
         // selection.)
         if (this._modifierMask) {
-            let [x, y, mods] = global.get_pointer();
+            let [x_, y_, mods] = global.get_pointer();
             if (!(mods & this._modifierMask)) {
                 this._finish(global.get_current_time());
                 return false;
@@ -184,7 +184,7 @@ var SwitcherPopup = GObject.registerClass({
 
     _keyReleaseEvent(actor, event) {
         if (this._modifierMask) {
-            let [x, y, mods] = global.get_pointer();
+            let [x_, y_, mods] = global.get_pointer();
             let state = mods & this._modifierMask;
 
             if (state == 0)
@@ -439,7 +439,7 @@ var SwitcherList = GObject.registerClass({
         let adjustment = this._scrollView.hscroll.adjustment;
         let [value] = adjustment.get_values();
         let [absItemX] = this._items[index].get_transformed_position();
-        let [result, posX, posY] = this.transform_stage_point(absItemX, 0);
+        let [result_, posX, posY_] = this.transform_stage_point(absItemX, 0);
         let [containerWidth] = this.get_transformed_size();
         if (posX + this._items[index].get_width() > containerWidth)
             this._scrollToRight();
@@ -450,7 +450,7 @@ var SwitcherList = GObject.registerClass({
 
     _scrollToLeft() {
         let adjustment = this._scrollView.hscroll.adjustment;
-        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
+        let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();
 
         let item = this._items[this._highlighted];
 
@@ -474,7 +474,7 @@ var SwitcherList = GObject.registerClass({
 
     _scrollToRight() {
         let adjustment = this._scrollView.hscroll.adjustment;
-        let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
+        let [value, lower_, upper, stepIncrement_, pageIncrement_, pageSize] = adjustment.get_values();
 
         let item = this._items[this._highlighted];
 
index 1acedd6d70a1e5a7aeee2b16512262ce0d50a3ed..b88d9cc7bb8fbfddc3020662f7d3b5ce716df0f9 100644 (file)
@@ -1521,7 +1521,7 @@ var Workspace = class {
             return;
         }
 
-        let [clone, overlay] = this._addWindowClone(win, false);
+        let [clone, overlay_] = this._addWindowClone(win, false);
 
         if (win._overviewHint) {
             let x = win._overviewHint.x - this.actor.x;
index 820be635adfde380ba8fb0f90d410270afde473d..d639386b418cf5b23f73fe1c7f6793795d26a977 100644 (file)
@@ -683,7 +683,7 @@ class ThumbnailsBox extends St.Widget {
     }
 
     _activateThumbnailAtPoint(stageX, stageY, time) {
-        let [r, x, y] = this.transform_stage_point(stageX, stageY);
+        let [r_, x_, y] = this.transform_stage_point(stageX, stageY);
 
         for (let i = 0; i < this._thumbnails.length; i++) {
             let thumbnail = this._thumbnails[i];
index ca3e15f771c1fdebae2cf525fcf36a859d664049..57227c0e107bb71ecca335605394d250c4aaaf5f 100644 (file)
@@ -530,7 +530,7 @@ var WorkspacesDisplay = class {
     }
 
     _onPan(action) {
-        let [dist, dx, dy] = action.get_motion_delta(0);
+        let [dist_, dx, dy] = action.get_motion_delta(0);
         let adjustment = this._scrollAdjustment;
         if (global.workspace_manager.layout_rows == -1)
             adjustment.value -= (dy / this.actor.height) * adjustment.page_size;
index 9749b81bf1b9c0093eb82749374c4baaadbb3952..d56385428fa71440b8a5351edc6c1459ac8001e2 100644 (file)
@@ -101,7 +101,7 @@ var XdndHandler = class {
 
         while (pickedActor) {
             if (pickedActor._delegate && pickedActor._delegate.handleDragOver) {
-                let [r, targX, targY] = pickedActor.transform_stage_point(x, y);
+                let [r_, targX, targY] = pickedActor.transform_stage_point(x, y);
                 let result = pickedActor._delegate.handleDragOver(this,
                                                                   dragEvent.dragActor,
                                                                   targX,